Merge branch 'master' into skytraq
authorGPSBabel <gpsbabel@users.noreply.github.com>
Thu, 14 Feb 2019 20:39:32 +0000 (14:39 -0600)
committerGitHub <noreply@github.com>
Thu, 14 Feb 2019 20:39:32 +0000 (14:39 -0600)

Trivial merge